From 9c7b0f0491d24d950387244fe5b4e750f11fa1e4 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 16 Jun 2015 12:02:41 -0700 Subject: [PATCH] overlay: remove gtk_overlay_add_pass_through_overlay() The API to access this functionality will be the setter we just added in the previous commit. https://bugzilla.gnome.org/show_bug.cgi?id=750568 --- docs/reference/gtk/gtk3-sections.txt | 1 - gtk/gtkoverlay.c | 43 ---------------------------- gtk/gtkoverlay.h | 3 -- tests/testoverlay.c | 3 +- 4 files changed, 2 insertions(+), 48 deletions(-) diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index effa865b0b..1967110df9 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -7773,7 +7773,6 @@ GtkOverlayClass gtk_overlay_new gtk_overlay_add_overlay -gtk_overlay_add_pass_through_overlay gtk_overlay_reorder_overlay gtk_overlay_get_overlay_pass_through gtk_overlay_set_overlay_pass_through diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index efe85572dc..9512a2d78b 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -948,46 +948,3 @@ gtk_overlay_get_overlay_pass_through (GtkOverlay *overlay, return pass_through; } - -/** - * gtk_overlay_add_pass_through_overlay: - * @overlay: a #GtkOverlay - * @widget: a #GtkWidget to be added to the container - * - * Adds @widget to @overlay, allowing input to fall through - * to the main child in non-interactive areas. - * - * The widget will be stacked on top of the main widget - * added with gtk_container_add(). - * - * The position at which @widget is placed is determined - * from its #GtkWidget:halign and #GtkWidget:valign properties. - * - * Since: 3.18 - */ -void -gtk_overlay_add_pass_through_overlay (GtkOverlay *overlay, - GtkWidget *widget) -{ - GtkOverlayPrivate *priv = overlay->priv; - GtkOverlayChild *child; - - g_return_if_fail (GTK_IS_OVERLAY (overlay)); - g_return_if_fail (GTK_IS_WIDGET (widget)); - - child = g_slice_new0 (GtkOverlayChild); - child->widget = widget; - child->pass_through = TRUE; - - priv->children = g_slist_append (priv->children, child); - - if (gtk_widget_get_realized (GTK_WIDGET (overlay))) - { - child->window = gtk_overlay_create_child_window (overlay, child); - gtk_widget_set_parent (widget, GTK_WIDGET (overlay)); - } - else - gtk_widget_set_parent (widget, GTK_WIDGET (overlay)); - - gtk_widget_child_notify (widget, "index"); -} diff --git a/gtk/gtkoverlay.h b/gtk/gtkoverlay.h index 95700f974e..bf9fc62761 100644 --- a/gtk/gtkoverlay.h +++ b/gtk/gtkoverlay.h @@ -84,9 +84,6 @@ GDK_AVAILABLE_IN_3_2 void gtk_overlay_add_overlay (GtkOverlay *overlay, GtkWidget *widget); GDK_AVAILABLE_IN_3_18 -void gtk_overlay_add_pass_through_overlay (GtkOverlay *overlay, - GtkWidget *widget); -GDK_AVAILABLE_IN_3_18 void gtk_overlay_reorder_overlay (GtkOverlay *overlay, GtkWidget *child, gint position); diff --git a/tests/testoverlay.c b/tests/testoverlay.c index 2aab3f56a7..5f0ec47550 100644 --- a/tests/testoverlay.c +++ b/tests/testoverlay.c @@ -440,7 +440,8 @@ test_input_stacking (void) } vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_overlay_add_pass_through_overlay (GTK_OVERLAY (overlay), vbox); + gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox); + gtk_overlay_set_overlay_pass_through (GTK_OVERLAY (overlay), vbox, TRUE); gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER); gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER); -- 2.30.2